Merge commit 'jdeseno/remove-deprecated' into update
authorAlex Crichton <alex@alexcrichton.com>
Tue, 21 Oct 2014 15:34:23 +0000 (08:34 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 21 Oct 2014 15:34:23 +0000 (08:34 -0700)

Trivial merge